Changeset 2320

Timestamp:

08/13/14 17:28:44 (10 years ago)

Author:

jgipsl

Message:

As [2319] now for _v6 : Removed option to automatically launch create_etat0_limit in a simulation with the gcm.
See ticket #70

Location:

CONFIG/UNIFORM/v6

Files:

• IPSLCM6/GENERAL/DRIVER/lmdz.driver (modified) (1 diff)
• LMDZOR_v6/GENERAL/DRIVER/lmdz.driver (modified) (1 diff)

CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/DRIVER/lmdz.driver

@@ -571 +571 @@
     fi
 
-    if ( ${FirstInitialize} ) ; then
-        if [ -f start.nc ] && [ -f startphy.nc ] ; then
-            # The restart files already exist. They have been copied from a previous run or from a CREATE job
-            echo "Restart files for LMDZ have been copied from a previous run"
-        elif [ -f create_etat0_limit* ] || [ -f ce0l* ] && [ ! -f lmdz.x ] ; then
-            # Do nothing because it is the program for creating restart files that is running and not LMDZ
-            echo "create_etat0_limit.e will create initial start files"
-        else
-            # Restart files have to be created
-            echo "Run create_etat0_limit.e to create restart files start.nc and startphy.nc for LMDZ"
-            if [ ${DRYRUN} -le 2 ] ; then
-                ##-- suppression of ozone file construction --
-                cp config.def config.def.save
-                LMDZ_sed config.def read_climoz 0
-                IGCM_sys_Cp ${R_EXE}/create_etat0_limit.e ${RUN_DIR}/.
-                if [ ${DRYRUN} -le 1 ] ; then
-                    ${HOST_MPIRUN_COMMAND} -np 1 ./create_etat0_limit.e
-                    IGCM_sys_Put_Out start.nc    ${R_OUT_ATM_R}/${config_UserChoices_JobName}_${PeriodDateBegin}_start.nc
-                    IGCM_sys_Put_Out startphy.nc ${R_OUT_ATM_R}/${config_UserChoices_JobName}_${PeriodDateBegin}_startphy.nc
-                fi
-                IGCM_sys_Mv config.def.save config.def
-            else
-                echo "EXECUTION of ${HOST_MPIRUN_COMMAND} -np 1 ./create_etat0_limit.e simulated"
-                echo "EXECUTION of ${HOST_MPIRUN_COMMAND} -np 1 ./create_etat0_limit.e simulated for DRYRUN = " $DRYRUN >> stack
-            fi
-        fi
-    fi
-
     if [ X${lmdz_UserChoices_XIOS}  = Xy ] ; then
     # Add include of LMDZ context in iodef.xml

CONFIG/UNIFORM/v6/LMDZOR_v6/GENERAL/DRIVER/lmdz.driver

@@ -468 +468 @@
         ByPass_hgardfou_mats=n
         IGCM_card_WriteOption ${SUBMIT_DIR}/COMP/lmdz.card UserChoices ByPass_hgardfou_mats "${ByPass_hgardfou_mats}"
-    fi
-
-    if ( ${FirstInitialize} ) ; then
-        if [ -f start.nc ] && [ -f startphy.nc ] ; then
-            # The restart files already exist. They have been copied from a previous run or from a CREATE job
-            echo "Restart files for LMDZ have been copied from a previous run"
-        elif [ -f create_etat0_limit* ] || [ -f ce0l* ] && [ ! -f lmdz.x ] ; then
-            # Do nothing because it is the program for creating restart files that is running and not LMDZ
-            echo "create_etat0_limit.e will create initial start files"
-        else
-            # Restart files have to be created
-            echo "Run create_etat0_limit.e to create restart files start.nc and startphy.nc for LMDZ"
-            if [ ${DRYRUN} -le 2 ] ; then
-                ##-- suppression of ozone file construction --
-                cp config.def config.def.save
-                LMDZ_sed config.def read_climoz 0
-                IGCM_sys_Cp ${R_EXE}/create_etat0_limit.e ${RUN_DIR}/.
-                if [ ${DRYRUN} -le 1 ] ; then
-                    ${HOST_MPIRUN_COMMAND} -np 1 ./create_etat0_limit.e
-                    IGCM_sys_Put_Out start.nc    ${R_OUT_ATM_R}/${config_UserChoices_JobName}_${PeriodDateBegin}_start.nc
-                    IGCM_sys_Put_Out startphy.nc ${R_OUT_ATM_R}/${config_UserChoices_JobName}_${PeriodDateBegin}_startphy.nc
-                fi
-                IGCM_sys_Mv config.def.save config.def
-            else
-                echo "EXECUTION of ${HOST_MPIRUN_COMMAND} -np 1 ./create_etat0_limit.e simulated"
-                echo "EXECUTION of ${HOST_MPIRUN_COMMAND} -np 1 ./create_etat0_limit.e simulated for DRYRUN = " $DRYRUN >> stack
-            fi
-        fi
     fi