Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync Main and develop #52

Merged
merged 27 commits into from
Nov 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
78ea4b4
geosmit env and run scripts
afahadabdullah Sep 14, 2023
defefaf
Update MOM_input
sanAkel Oct 4, 2023
20d5932
Delete MOM6_GEOSPlug/mom6_app/360x320 directory
sanAkel Oct 4, 2023
1334428
Delete MOM6_GEOSPlug/mom6_app/360x210 directory
sanAkel Oct 4, 2023
dce39f7
Update MOM_input
sanAkel Oct 4, 2023
bf2ccee
Update MOM_override
sanAkel Oct 4, 2023
6bf126d
Update MOM_input
sanAkel Oct 4, 2023
c3b821e
Update MOM_input
sanAkel Oct 4, 2023
5716c3b
Update MOM_input
sanAkel Oct 5, 2023
b7aab8a
updated script for v11.1.1
afahadabdullah Oct 6, 2023
cfb24f2
Merge branch 'develop' into mitupdate
afahadabdullah Oct 6, 2023
9f8d95e
geosmit env scripts updated for v11.1.1
afahadabdullah Oct 6, 2023
43b898d
Merge pull request #43 from GEOS-ESM/mitupdate
sanAkel Oct 7, 2023
d80fe54
Merge branch 'develop' into sanAkel-patch-1
sanAkel Oct 10, 2023
fb9ee73
Merge branch 'develop' into sanAkel-patch-1
sanAkel Oct 10, 2023
4d2e229
Update checkout_geosmitv11.1.1.txt
afahadabdullah Oct 10, 2023
e29c8b6
Merge pull request #48 from GEOS-ESM/bugfix/afahad/mitgcm
sanAkel Oct 11, 2023
eb6540f
Merge branch 'develop' into sanAkel-patch-1
sanAkel Oct 11, 2023
d7d2c6f
Update CMakeLists.txt
sanAkel Oct 21, 2023
0f2af02
Create data_table
sanAkel Oct 31, 2023
aa34d36
Trivial commit to re-trigger CI
mathomp4 Oct 31, 2023
a649d4d
Merge pull request #47 from GEOS-ESM/sanAkel-patch-1
mathomp4 Nov 2, 2023
ec7cb37
Merge branch 'develop' into sanAkel-patch-2
mathomp4 Nov 2, 2023
8726fc3
Get rid of obsolete option
sanAkel Nov 16, 2023
dd827da
Merge pull request #49 from GEOS-ESM/sanAkel-patch-2
mathomp4 Nov 20, 2023
7b74a63
Update input.nml
sanAkel Nov 20, 2023
05f0316
Merge pull request #51 from GEOS-ESM/sanAkel-patch-1
mathomp4 Nov 20, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2.1

# Anchors to prevent forgetting to update a version
#baselibs_version: &baselibs_version v7.14.0
#bcs_version: &bcs_version v11.1.0
#bcs_version: &bcs_version v11.3.0

orbs:
ci: geos-esm/circleci-tools@1
Expand Down
119 changes: 119 additions & 0 deletions MIT_GEOS5PlugMod/instructions/checkout_geosmitv11.1.1.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
git clone [email protected]:GEOS-ESM/GEOSgcm.git
cd GEOSgcm
git checkout tags/v11.1.1

# NAS load modules

module use -a /nobackup/gmao_SIteam/modulefiles
module load GEOSenv
mepo clone
source @env/g5_modules


# build

mkdir build
cd build

cmake .. -DBASEDIR=$BASEDIR/Linux -DCMAKE_INSTALL_PREFIX=../install -DBUILD_MIT_OCEAN=ON -DMIT_CONFIG_ID=c90_llc90_02 -DCMAKE_Fortran_COMPILER=ifort

# add at the end for debug -DCMAKE_BUILD_TYPE=Debug

make -j 12 install

cd ../install/bin/

sed -i 's|setenv MASDIR /u/$LOGNAME/GEOS5.0/$expid|#setenv MASDIR /u/$LOGNAME/GEOS5.0/$expid|g' ../post/gcmpost.script

sed -i '596i \ \ \ \ \ \ \ set DEFAULT_HISTORY_TEMPLATE="HISTORY.AOGCM.rc.tmpl"' gcm_setup



# creating exp from install/bin/ directory

./gcm_setup

# example inputs

Enter the Experiment ID:
GEOSMIT_29test
Enter a 1-line Experiment Description:
test exp
Do you wish to CLONE an old experiment? (Default: NO or FALSE)
NO
Enter the Atmospheric Horizontal Resolution code:
c90
Enter the Atmospheric Model Vertical Resolution: LM (Default: 72)
72
Enter Choice for Atmospheric Model Microphysics: (Default: BACM_1M)
BACM_1M

Use Hydrostatic Atmosphere? (Default: TRUE)
TRUE
Do you wish to IOSERVER? (Default: NO or FALSE)
NO
Enter the Processor Type you wish to run on:
sky
Do you wish to run the COUPLED Ocean/Sea-Ice Model? (Default: NO or FALSE)
YES

Choose an Ocean Model: (Default: MOM5)
MIT

Choose a Seaice Model: (Default: CICE4)

Enter the Ocean Horizontal Resolution:
llc90

Enter the Ocean Model Vertical Resolution: LM (Default: 50)
50

Enter the choice of Land Surface Boundary Conditions using: 1 (Icarus), 2 (Default: Icarus-NLv3)
2

Enter the choice of Land Surface Model using: 1 (Default: Catchment), 2 (CatchmentCN-CLM4.0 (CN_CLM40)), 3 (CatchmentCN-CLM4.5 (CN_CLM45))
1

Do you wish to run GOCART with Actual or Climatological Aerosols? (Enter: A (Default) or C)
A

Enter the GOCART Emission Files to use: AMIP (Default) or OPS:
AMIP

Enter HEARTBEAT_DT to use
450

Enter the filename of the HISTORY template to use
-----------------------------------------------------------
As MIT was chosen, the default HISTORY Template is HISTORY.AOGCM.rc.tmpl
1. Hit ENTER to use the default HISTORY template (HISTORY.AOGCM.rc.tmpl)
Using HISTORY.AOGCM.rc.tmpl

You must now copy your Initial Conditions into:
-----------------------------------------------
/nobackupp11/afahad/exp/GEOSMIT_29test



# config exp

#cd to exp dir

cd /nobackupp11/afahad/exp/GEOSMIT_29test

#copy GEOS restarts
cp /nobackupp11/afahad/GEOSMITgcmFiles/restarts-orig/* .

#copy mit input dir
cp -r /nobackupp11/afahad/GEOSMITgcmFiles/mit_input_llc90_02/ mit_input

# copy env script
cp /nobackupp11/afahad/GEOSMITgcmFiles/geosmitenv_v11.1.1.sh .

./geosmitenv_v11.1.1.sh

#submit job

qsub gcm_run.j


115 changes: 115 additions & 0 deletions MIT_GEOS5PlugMod/instructions/checkout_geosmitv11.1.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
git clone [email protected]:GEOS-ESM/GEOSgcm.git
cd GEOSgcm
git checkout tags/v11.1.0

# NAS load modules

module use -a /nobackup/gmao_SIteam/modulefiles
module load GEOSenv
mepo clone
source @env/g5_modules


# build

mkdir build
cd build

cmake .. -DBASEDIR=$BASEDIR/Linux -DCMAKE_INSTALL_PREFIX=../install -DBUILD_MIT_OCEAN=ON -DMIT_CONFIG_ID=c90_llc90_02 -DCMAKE_Fortran_COMPILER=ifort

# add at the end for debug -DCMAKE_BUILD_TYPE=Debug

make -j 12 install

cd ../install/bin/

sed -i '577i \ \ \ \ \ \ \ set DEFAULT_HISTORY_TEMPLATE="HISTORY.AOGCM.rc.tmpl"' gcm_setup



# creating exp from install/bin/ directory

./gcm_setup

# example inputs

Enter the Experiment ID:
GEOSMIT_29test
Enter a 1-line Experiment Description:
test exp
Do you wish to CLONE an old experiment? (Default: NO or FALSE)
NO
Enter the Atmospheric Horizontal Resolution code:
c90
Enter the Atmospheric Model Vertical Resolution: LM (Default: 72)
72
Enter Choice for Atmospheric Model Microphysics: (Default: BACM_1M)
BACM_1M

Use Hydrostatic Atmosphere? (Default: TRUE)
TRUE
Do you wish to IOSERVER? (Default: NO or FALSE)
NO
Enter the Processor Type you wish to run on:
sky
Do you wish to run the COUPLED Ocean/Sea-Ice Model? (Default: NO or FALSE)
YES

Choose an Ocean Model: (Default: MOM5)
MIT

Enter the Ocean Horizontal Resolution:
llc90

Enter the Ocean Model Vertical Resolution: LM (Default: 50)
50

Enter the choice of Land Surface Boundary Conditions using: 1 (Icarus), 2 (Default: Icarus-NLv3)
2

Enter the choice of Land Surface Model using: 1 (Default: Catchment), 2 (CatchmentCN-CLM4.0 (CN_CLM40)), 3 (CatchmentCN-CLM4.5 (CN_CLM45))
1

Do you wish to run GOCART with Actual or Climatological Aerosols? (Enter: A (Default) or C)
A

Enter the GOCART Emission Files to use: AMIP (Default) or OPS:
AMIP

Enter HEARTBEAT_DT to use
450

Enter the filename of the HISTORY template to use
-----------------------------------------------------------
As MIT was chosen, the default HISTORY Template is HISTORY.AOGCM.rc.tmpl
1. Hit ENTER to use the default HISTORY template (HISTORY.AOGCM.rc.tmpl)
Using HISTORY.AOGCM.rc.tmpl

You must now copy your Initial Conditions into:
-----------------------------------------------
/nobackupp11/afahad/exp/GEOSMIT_29test



# config exp

#cd to exp dir

cd /nobackupp11/afahad/exp/GEOSMIT_29test

#copy GEOS restarts
cp /nobackupp11/afahad/GEOSMITgcmFiles/restarts-orig/* .

#copy mit input dir
cp -r /nobackupp11/afahad/GEOSMITgcmFiles/mit_input_llc90_02/ mit_input

# copy env script
cp /nobackupp11/afahad/GEOSMITgcmFiles/geosmitenv_v11.1.sh .

./geosmitenv_v11.1.sh

#submit job

qsub gcm_run.j


Loading
Loading