Changeset 1585 for branches/libIGCM_CESMEP/libIGCM_sys/libIGCM_sys_irene-amd.ksh

Timestamp:

04/25/23 14:26:44 (15 months ago)

Author:

ssenesi

Message:

merge branch libIGCM_CESMEP with trunk that handles RedHat8 on Irene

File:

• branches/libIGCM_CESMEP/libIGCM_sys/libIGCM_sys_irene-amd.ksh (modified) (7 diffs)

branches/libIGCM_CESMEP/libIGCM_sys/libIGCM_sys_irene-amd.ksh

@@ -38 +38 @@
 #====================================================
 # Turn in dry run mode ? (sys_Put_Rest, sys_Put_Out, sys_Get)
-typeset -r DRYRUN=${DRYRUN:=0}
+if ([ X${DRYRUN} != X ] && [ ${DRYRUN} = 4 ]) ; then
+  typeset -r DRYRUN=0
+  typeset -r DRYRUN_DEBUG=4
+else
+  typeset -r DRYRUN=${DRYRUN:=0}
+  typeset -r DRYRUN_DEBUG=0
+fi
 
 # YOU MUST COMPILE YOUR EXE FILES FOR DRYRUN MODE !
@@ -54 +60 @@
 # |    3     |       yes           |    no      |  no     |      no                   |
 # -------------------------------------------------------------------------------------
+# |    4     |       yes           |    yes     |  creation of RUN_DIR and Job_debug  |
+# -------------------------------------------------------------------------------------
+
 
 #=====================================================
@@ -96 +105 @@
 # Set environment tools (ferret, nco, cdo, rebuild, ...)
 #====================================================
+typeset CCCOS=${CCCOS:=$( ccc_os )}
+
 if [ X${TaskType} = Xcomputing ] ; then
   IGCM_debug_Print 1 "Modules will be loaded later in IGCM_sys_activ_variables."
 else
   module purge > /dev/null 2>&1
-  . $( ccc_home -u igcmg)/MachineEnvironment/irene-amd/env_irene-amd > /dev/null 2>&1
-  . $( ccc_home -u igcmg)/MachineEnvironment/irene-amd/env_atlas_irene-amd > /dev/null 2>&1
+  if [ X${CCCOS} = X"Rhel_8__x86_64" ] ; then
+      . $( ccc_home -u igcmg)/MachineEnvironment/irene/env_atlas_irene > /dev/null 2>&1
+  else
+      . $( ccc_home -u igcmg)/MachineEnvironment/irene-amd_prev/env_irene-amd > /dev/null 2>&1
+      . $( ccc_home -u igcmg)/MachineEnvironment/irene-amd_prev/env_atlas_irene-amd > /dev/null 2>&1
+  fi
 
   export PCMDI_MP=/ccc/work/cont003/igcmg/igcmg/PCMDI-MP
@@ -112 +127 @@
 
 # For AddNoise and AddPertu3DOCE
-export PATH=${PATH}:$(ccc_home -u igcmg)/Tools/irene-amd/bin
+export PATH=${PATH}:$(ccc_home -u igcmg)/Tools/irene/bin
 
 # For rebuild
-export PATH=${PATH}:$(ccc_home -u igcmg)/Tools/irene-amd/rebuild/modipsl_IOIPSL_PLUS_v2_2_4/bin
+export PATH=${PATH}:$(ccc_home -u igcmg)/Tools/irene/rebuild/modipsl/bin
 
 #====================================================
@@ -942 +957 @@
 
     if [ "$#" -eq 1 ]; then
-      $(ccc_home -u igcmg)/Tools/irene-amd/thredds_rm public/${LOGIN}/${R_DODS}/${1} # > out_dods_rm 2>&1
+      $(ccc_home -u igcmg)/Tools/irene/thredds_rm public/${LOGIN}/${R_DODS}/${1} # > out_dods_rm 2>&1
       status=$?
     else
-      $(ccc_home -u igcmg)/Tools/irene-amd/thredds_rm public/${LOGIN}/${R_DODS} # > out_dods_rm 2>&1
+      $(ccc_home -u igcmg)/Tools/irene/thredds_rm public/${LOGIN}/${R_DODS} # > out_dods_rm 2>&1
       status=$?
     fi
@@ -979 +994 @@
 #    fi
 
-    $(ccc_home -u igcmg)/Tools/irene-amd/thredds_cp ${1} public/${LOGIN}/${R_DODS} # > out_dods_cp 2>&1
+    $(ccc_home -u igcmg)/Tools/irene/thredds_cp ${1} public/${LOGIN}/${R_DODS} # > out_dods_cp 2>&1
     status=$?
 
@@ -1912 +1927 @@
   fi
 
-  $( ccc_home -u igcmg)/Tools/irene-amd/bin/rebuild_nemo ${1} ${2}
+  $( ccc_home -u igcmg)/Tools/irene/bin/rebuild_nemo ${1} ${2}
 
   IGCM_debug_PopStack "IGCM_sys_rebuild_nemo"